Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)
diff --cc doc/emacs/emacs.texi
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/menu-bar.el
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/progmodes/cperl-mode.el
Simple merge
diff --cc src/editfns.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 2 Jul 2023 00:26:54 +0000 (08:26 +0800)
		1	2
doc/emacs/emacs.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/PROBLEMS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/menu-bar.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cperl-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/editfns.c	patch \|	diff1 \|	diff2 \|	blob \| history